Revert dc1e8d9..946d18e

This rolls back to commit dc1e8d9599f807970ec8956ccf6c06eb6da8b4f1.