Revert 11d8726..3d9974c

This rolls back to commit 11d8726db376c35c7265dd8106811a20e24d755f.