Revert 32f502e..be4583e

This rolls back to commit 32f502e5a1355ae97a86fd042ca917ff45bdf65c.