Revert 14d9538..f770ee5

This rolls back to commit 14d95388fd43f16a5e1ff45e02728cc5801fd855.