Revert 28fdfd0..7a51f72

This rolls back to commit 28fdfd0506e4a0be8941b91d5aa31c85d927d277.