Revert 9ecdfb4..c61ecad

This rolls back to commit 9ecdfb400f7cfd924f371aca14b5af7ea81d2392.