Revert 4327f4c..7d4ad26

This rolls back to commit 4327f4c5d85d9bef3cdd82c249fa1998dcda4e2d.