Revert 7331c5d..7bb9f1e

This rolls back to commit 7331c5dd4635828fcf655a954c6bc1650facdc99.