Revert 5eea775..6b94ed5

This rolls back to commit 5eea775e84d11d474634313b9e43792f5d0a6230.