Revert 7a8c354..84c27f6

This rolls back to commit 7a8c3544d9cf88422a3b62fa1b3d5482803710fb.