Revert 52c51e7..42fa72c

This rolls back to commit 52c51e7d3a499d69ce0b02ebc483db7a4c9548af.