Revert a8e50d0..5250689

This rolls back to commit a8e50d02ac964a7eede2dd4d232ca5a791734875.