Revert a454f3c..081297e

This rolls back to commit a454f3cd3f3cc1f2b0c4d3b86f6af887519db435.