Revert 812ddca..dd94ca6

This rolls back to commit 812ddca0ee27014f5a29c14a731bbe913f3584c6.