This basically rolls back 64a119afb2 and b7f2a6d143. Fixes #188. Breaks #156 again but the next commit will fix this.
64a119afb2
b7f2a6d143