Revert ccacfec..e1d6274

This rolls back to commit ccacfecde1d678125ff3e3a813610b119fb4a395.