Revert 245855f..1477ea4

This rolls back to commit 245855f943f734d6d9072903b75e08adee691972.