Revert 3bb078a..5d514fe

This rolls back to commit 3bb078ae708f6614c8ce026b1d9df2b1524bc508.