Revert 07eeb4e..603d253

This rolls back to commit 07eeb4e43fdef9b81e217dc6337814b358551441.