Revert 7476e84..0787bbd

This rolls back to commit 7476e84e9b0049468b3df28b4852d2cd27da8f5a.