Revert 1c29ea3..a8c765e

This rolls back to commit 1c29ea32004c36b06b817927d6480dc3c8f13ae9.