Revert a571733..13d92f4

This rolls back to commit a5717333c5268f0f99e638b3af87942ecf313e8e.