Revert f040f57..edad951

This rolls back to commit f040f57d0350a86bf1df0fc2bfb7dd09cbe1e711.