Revert 506299d..da123f7

This rolls back to commit 506299d64765e6b5a3caf2930b30c6662c3be16b.