Revert 236cec9..a455ed6

This rolls back to commit 236cec9879912e3ad8159389cb2a5e0f4039cd52.