Revert 77fcdd7..fd77bb8

This rolls back to commit 77fcdd7aedb2797399d385f0ed62f81c5f4ab084.
Repost

This reverts commit 9c705250d9db0cd2f246b0cad5b21425d56b2b9c.