Revert 512157e..98cdc1b

This rolls back to commit 512157e355a09e7c602584f808cf60f52550bc76.