Revert 3b3efb4..f958759

This rolls back to commit 3b3efb41c4123ec14f2ff1718946277c2c6e1116.