Revert 5ba4922..2df3023

This rolls back to commit 5ba4922f9788126eef45d78654627dee658bb5e8.