Revert f2decf8..0d2e25c

This rolls back to commit f2decf8aa4b01b1a02f92952138f84682cfe4532.