Revert f5091c1..0bcb39e

This rolls back to commit f5091c109d0f8a143159ba1e5c04dd5416e29fee.