Revert a26931e..8a56a2c

This rolls back to commit a26931eb45728cec28a45571f307f220d3b62d36.