Revert 3e63268..ac92d09

This rolls back to commit 3e63268685ab419ae6d0d3e46e7405172d426b0a.
rollback to old method