Revert a889b3c..1bda620

This rolls back to commit a889b3c3b372c728c00b6a4b37f41f39e01cece0.