Revert 5338069..ee4b75e

This rolls back to commit 5338069fe41de5a03043ad9dd88a132d3de2946c.