Revert a2c8ac6..8b67256

This rolls back to commit a2c8ac66875de878df3cc679493f16d8881ce758.