Revert cec4b2b..eb41d85

This rolls back to commit cec4b2b9fb0af77b076b7d2a2c0004c02b3e0c8d.