Revert f5edd18..1dc6129

This rolls back to commit f5edd180f5f4894901737909d20b9ee624d9f02f.