Revert 98a6fa2..0bfe1fb

This rolls back to commit 98a6fa286b949eb36510a882ebdb932f31e1d344.