Revert 9e59d69..5810f61

This rolls back to commit 9e59d6955837f853bce35e81e50704f16c0e2bdc.